Merge "Workaround global ThinLTO build break" am: 06c47e70a4 am: 78edf52928 am: 2405f41b57

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

Change-Id: Ie61fe46a15f2eb8a22c973e57757ec40dc44b90a