Merge changes from topic "am-a4fc79aa8a7f4f2bbfed940ed8f78c83" into...

Merge changes from topic "am-a4fc79aa8a7f4f2bbfed940ed8f78c83" into tm-qpr-dev-plus-aosp am: c6cc86f4

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



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