[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-f2950471d1a747418b586b3c237b5a50" into sc-v2-dev am: d9fa19e0 am: c390a897 -s ours

am skip reason: Merged-In Ifb73b0145aeb8afb62d1f55d2f881347b0d2ef8a with SHA-1 bd4cd387 is already in history

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

Change-Id: I66047c5c6f78569c80a0ab68c0f435ffabb188d9