Merge changes I16418791,I210f5ddc am: b52609172e

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

Change-Id: I255850295426742033b60d16f30f676e96f6bb4d