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

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

Change-Id: I50a17e3b0a1d0da3794db7704585a7d1df3af14e