Merge changes If4e2ba62,Iefd7e8e8 into tm-qpr-dev am: b0d018239d

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

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