Merge changes I54c2258c,I47b2d3ac am: 53de4cb310

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936446

Change-Id: Id51ceff565e5d5467f3a236b5d43e5395d65bdac