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

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

Change-Id: Ia725779e54296a0abb6ef7a049a58e44bb470e0e