Merge changes Icabed06e,I25bc13c6 am: afce05e2e5 am: 9de9c7f693 am: 0d7b83fdfc

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

Change-Id: I30dd88632cf46ac567c6f68f57d6f5bea2a1e8e2