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

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

Change-Id: I69cac757b38d9481e2f0036bb3f75ac130131e05