Merge "Revert "Revert "Revert "Revert "Workaround build breakage from f...""...

Merge "Revert "Revert "Revert "Revert "Workaround build breakage from f..."" into main am: df34b537 am: e0b831f1

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



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