Merge changes I58502249,I6db85a44 am: 4d6002c204 am: e9485a4144 am: a3efbc72d0

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

Change-Id: I20f9ea5b1569c1359d1e07ac177d3a53fc475c93