Merge "Workaround global ThinLTO build break" am: 06c47e70a4 am: 78edf52928 am: 2405f41b57 am: 198e7d360f am: 840761f7a4

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

Change-Id: I63cdb711861cee72aae845cf31978ba962c31ce2