[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-08bbcb587d4e47b6afcc900c23899344" into sc-v2-dev am: 0f608efd am: 2081b5d0 -s ours

am skip reason: Merged-In Iaa778616eca4cfad83a94297d9cd6116bb9577e7 with SHA-1 e4b76fc2 is already in history

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

Change-Id: Id05a85a0f7254f4a911969bac596194397ee3dd9