Merge changes If4e2ba62,Iefd7e8e8 into tm-qpr-dev am: b0d01823 am: 53e391d8

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



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