[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-eff2a387dc434e1ab6d0febedea6b507" into sc-qpr1-dev am: e0ec4da1 -s ours am: 7d1b5305 -s ours am: 2ea2086c -s ours am: 1773792d -s ours

am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 cdb89505 is already in history

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

Change-Id: Ia919e5b7ff0c566fc40940bacc36a638a4b9899e