Merge changes Ifece2dc6,Id0c37612 into tm-qpr-dev am: 3dad16a68c am: 973b3adce7

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

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