Merge "Fix error for compiler update." into sc-dev-plus-aosp am: 40535b2720

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15329855

Change-Id: I932156c16a3f64afcbcd7ae02bb2aa2264a40746