Merge changes from topic "am-467004eedd8a4adb8936d292c89ea5ff" into...

Merge changes from topic "am-467004eedd8a4adb8936d292c89ea5ff" into tm-qpr-dev-plus-aosp am: 3bb92a86 -s ours

am skip reason: Merged-In I3e96ab6ada8f0c892613a1f9dcc6b6ae12f6d73b with SHA-1 225651dc is already in history

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



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