Merge changes Icea03eb6,Idad15d8e into tm-qpr-dev am: 4ccdca90b7 am: f0ab402957

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

Change-Id: I9aca9c07b5c9988780b1fb2dbd8fd43f19f9e33c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>