[automerger skipped] Merge "Revert "Fix a bad merge"" into sc-v2-dev am:...

[automerger skipped] Merge "Revert "Fix a bad merge"" into sc-v2-dev am: 1301c316 -s ours am: 06e3e456 -s ours

am skip reason: Merged-In I1138079b1ae05248cefa211e0597fd6723a8bbba with SHA-1 6173c266 is already in history. Merged-In was found from reverted change.

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

Change-Id: I2e751ab199a3466918866a197885c03c6f48ef18