[automerger skipped] resolve merge conflicts of c5d6a8e7 to sc-v2-dev am: d91988e9 -s ours am: 66b94f1a -s ours

am skip reason: Merged-In I3dba7719ac4c4d178c9ec5265865961dbd0450f9 with SHA-1 4a2c962e is already in history

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

Change-Id: I1504ab767408f2aeac6df9628f696d687c277c0c