Merge changes from topic "revert-2264526-QTJABPYRJT" am: 4215d4a2af

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

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