[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-f6a3dc4aa5e04877a31cf3a49c4a0612" into sc-v2-dev-plus-aosp am: 13f61721 -s ours am: 5706587d -s ours am: 4c439cc9 -s ours

am skip reason: Merged-In I8fd3494a3cd7ad6183ce6aa442e49f85b441c73f with SHA-1 f80d567a is already in history

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

Change-Id: Iea3716b66ee2d763e670327056232779fcaeae31