Merge changes from topic "revert-16943318-presubmit-am-bc566b73c1674298b82a1153c03313a1-GMQPQDTARU" into sc-v2-dev-plus-aosp am: 7b9b93a3 am: 0ea11307

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

Change-Id: Ic78878e0f18483b601ca0d0a937679c62b70f314