Merge changes from topic "am-9386409e3b7d4599ba7fc5332a9434f8" into...

Merge changes from topic "am-9386409e3b7d4599ba7fc5332a9434f8" into tm-qpr-dev-plus-aosp am: a3a609ca -s ours

am skip reason: Merged-In I09d64452c46c4d21b9d958570020b2f5e6c2b23f with SHA-1 223e9c58 is already in history

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



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