[automerger skipped] Merge "Fix a bad merge" into sc-v2-dev am: dea56275 -s ours am: e4a2f3f3 -s ours

am skip reason: Merged-In I1138079b1ae05248cefa211e0597fd6723a8bbba with SHA-1 6173c266 is already in history

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

Change-Id: I1e58a45b774b3720aff4a308ec6449d0f322b9ef