Merge changes Icb59b15d,I6fc6a266,I5cc340e5,I94db52a8 am: b79dcb24d0 am: 5804521e8c

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

Change-Id: I0c8987358edd0d77965507819e81faa21daaf767