Merge changes Ide7d63a7,I9e075f29 into tm-qpr-dev am: 337e5497e7

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

Change-Id: I1f30d87947157b091dae4d5f5672fe1ee8055f03
Signed-off-by: Automerger Merge Worker <[email protected]>