Merge "Revert "Workaround build breakage from full LTO optimization"" into main am: 11bb56ec5c

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

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