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

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

Change-Id: If3f90636d72521fd068cb1c3c1d3167604fe0de5