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

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

Change-Id: Ie0570c14afdc1e0b5440deb521a4491a2bc78c65