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

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

Change-Id: Ib2a5252323f702e7d0d9847558e5b4da16703f29