[automerger skipped] Merge "resolve merge conflicts of...

[automerger skipped] Merge "resolve merge conflicts of fc3491bd to sc-v2-dev" into sc-v2-dev am: d50a1352 am: cc1b2feb -s ours

am skip reason: Merged-In I50a0f3a8ea49beb5c86fff0f6bb8c005db581a6d with SHA-1 b5d81f09 is already in history

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

Change-Id: I40b87b5b43d8db60e074e8ebcc02dfc68c1c3dcc