Merge "Workaround global ThinLTO build break" am: 06c47e70a4

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

Change-Id: Ic22ceb533d17740c17ab8e01bdeebebb54719b1d