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

Merge changes from topic "am-ecd4d94c0bc44d5fbf5498495a7984a7" into tm-qpr-dev-plus-aosp am: b0ae2a9b -s ours

am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 aa170108 is already in history

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



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