[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-5d70d7e9c9634af1b0b082cbc89e0dad-sc-qpr1-dev-sc-dev" into sc-mainline-prod am: af915107 -s ours am: 1009c7d3 -s ours

am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 b8c4819e is already in history

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



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