Merge changes I4dff7875,If2dbfc35 into tm-qpr-dev am: 25829c3e1b am: 7bd2e234b7

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

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