[automerger skipped] Partially revert ag/17294635 am: ca544abf am:...

[automerger skipped] Partially revert ag/17294635 am: ca544abf am: 9efd98c8 -s ours am: f20ca6fc -s ours

am skip reason: Merged-In Id50e376c04141a347ff70cdc7ab7ad1fab661844 with SHA-1 5f601c4a is already in history

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



Change-Id: Ia104c05dc997bc305012703d5d6fe2235dbad3d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>