Merge changes I16418791,I210f5ddc am: b52609172e am: 86811b5fba am: 385a5e8cc0 am: 8e81d2573f

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

Change-Id: Ia8feea64f0459864c8e956f9f5a309c5f085cea3