Merge "Fix sysui studio build" into udc-dev am: 5bcb08c0 am: 32fa163e

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



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