Merge changes from topic "am-6af50db9c56b46a4aac24a2211c95a75" into...

Merge changes from topic "am-6af50db9c56b46a4aac24a2211c95a75" into tm-qpr-dev-plus-aosp am: 374e68b5

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



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