[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 49a91f2b to sc-v2-dev am: 2c4999e3 -s ours am: f98330d9 -s ours

am skip reason: Merged-In I5e3587ddb0fa4bd1ef68488485d73641e0582d2f with SHA-1 3a391dba is already in history

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

Change-Id: I867e6e3e32c379f06a29b84cd7bd9a0776d53b16