Merge changes from topic "am-d4c7f0b052a04c28b19a6658a8787898" into tm-qpr-dev-plus-aosp am: b4b7aa93

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



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