Merge changes Icabed06e,I25bc13c6 am: afce05e2e5 am: 9de9c7f693 am: 0d7b83fdfc am: 06996f5ca6 am: 7527a07a1c

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

Change-Id: I16e1b3fdb01f8add45a5358158f2dc5bd366fd9c