0685b82ee2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624059 Change-Id: I9dacf92104c544f9ed12dc6fa60e4895ab228cbd