[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-711e8625e1514f8785791e865e5a4d7d" into sc-qpr1-dev am: 53e52704 -s ours am: 5e7f43a1 -s ours am: 1a2e48eb -s ours

am skip reason: Merged-In Ia343ac70e5bb9aeae718fca6674e1ca491a14512 with SHA-1 02382b56 is already in history. Merged-In was found from reverted change.

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



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