Merge changes from topic "revert-2264526-QTJABPYRJT" am: 4215d4a2af am: 03a7e9adc2 am: 27279606a7

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

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