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

[automerger skipped] Merge changes from topic "b204906124-sc" into sc-mainline-prod am: bc73d79c -s ours am: 31954b82 -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: I42eb153991d7dfe7ace6d23ee157faf0b5d1e11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>