Merge changes I1f7b0181,I1ee616a3 into tm-qpr-dev am: a53c7bbec2

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

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