[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-6baeef138d0f4ff29bbaa3141165ea4e" into sc-v2-dev-plus-aosp am: bbbf94aa -s ours

am skip reason: Merged-In I748fdd49626acaa0e986a9d8038039cada6faa60 with SHA-1 44b0caa2 is already in history

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

Change-Id: I7da0f0280fe013462ee6cc2dc8f762edb6b59b71