[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-906e72617d4948ca88bdbf60b57feede" into tm-mainline-prod am: 309dc0ce -s ours

am skip reason: Merged-In I9e2f8ae64e3b4693df97bb05fc850209d6eb3597 with SHA-1 34582e78 is already in history

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



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