[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-41f55ec06ce44b7aaf10c778037774c5-sc-dev" into sc-qpr1-dev am: 92fde680 -s ours am: 218a268f -s ours am: 580993c8 -s ours am: b89045ad -s ours am: c4bbd9d6 -s ours am: b87a7ca2 -s ours

am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 3b0929a3 is already in history

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



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