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

Merge changes from topic "am-c4b7e98f4fc245ecb0cf89b442518c86" into tm-qpr-dev-plus-aosp am: 4be9c86e

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



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