Merge changes I4753cae7,Ic6554d9b am: d752b7b746 am: 4a14072d74

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

Change-Id: Id9cde9eee1e5c555a1d83507ac5000d6e99a13ce