1a480d9759
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2005491 Change-Id: Iad2d1f493d8f7185d7a8a4015dbbbae2bdc4959e