Merge "Fix sysui-studio build" into sc-v2-dev am: bb88853241 am: e46acef4c7

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

Change-Id: I3bd0c1f828ab1a57b0425d35aa3f6ea3977b9ad8