[automerger skipped] Merge changes from topic "presubmit-am-41f55ec06ce44b7aaf10c778037774c5-sc-dev" into sc-mainline-prod am: 270d62a2 -s ours am: 7bb20397 -s ours am: 50d1b86c -s ours am: 1e4d2445 -s ours am: b9e4e4d4 -s ours am: 6bda2043 -s ours

am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 39b4b1e9 is already in history

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



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