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

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

Change-Id: Ie009e43aa7ae340bf2fca180de637af0f2316521