[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-fb2ad2dd2c90444796b6fcab87178f40-sc-v2-dev" into sc-v2-dev-plus-aosp am: 447bfd4e -s ours

am skip reason: Merged-In I7beef692f01e32e0724273d2f9773e051c81c331 with SHA-1 335db53f is already in history

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

Change-Id: I002facf997b8d8eacc3f5cda6c282d00ee7f9cec