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

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

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