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

Merge changes from topic "am-e4817480bf014841a878ff0eb02a84eb" into tm-qpr-dev-plus-aosp am: 4c995a3e

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



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