24e038e8a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1811936 Change-Id: Ib8cf8010996f6eb52db438f5944af4b5ee66af7a