[automerger skipped] Merge changes from topic "b204906124-sc" into sc-qpr1-dev...

[automerger skipped] Merge changes from topic "b204906124-sc" into sc-qpr1-dev am: 25967449 -s ours am: 9037f3e9 -s ours am: 415faf89 -s ours

am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 2ab01736 is already in history

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



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