[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-b521fdc3415843d792ac3226b71ecb4a" into sc-qpr1-dev am: 985f6240 am: 6245532c -s ours am: 327da154 -s ours am: af07bf29 -s ours am: 859e6eeb -s ours

am skip reason: Merged-In Ib233ad754a6c6e3c4e0d0e10ed788ab8e055cccc with SHA-1 f4ed441e is already in history

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



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