Merge "Fix sysui-studio compilation." into tm-qpr-dev am: 6eeb27a3f5 am: f6da96cb23

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

Change-Id: I15ebd6395a7625ce35dc08b71141793eff3c03b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>