[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "revert-16712509-sc-dev-I3030c47be9d02a27505bd4775c1982a20755758c-sc-v2-dev-WCAVYOUACP" into sc-v2-dev-plus-aosp am: f2cbd0e4 -s ours am: 7bf5e43d -s ours

am skip reason: Merged-In I3030c47be9d02a27505bd4775c1982a20755758c with SHA-1 69538cf7 is already in history. Merged-In was found from reverted change.

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

Change-Id: I50e4d5d09e0a77a78561e2417a39bbd544e8fe1a