[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-b2c0d11691d5423bbb319ff288b50a20" into tm-mainline-prod am: be8ab069 -s ours

am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 0d304b02 is already in history

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

Change-Id: Ic75c9db2597edf5e0664a3a91182e9a3932486fe