Merge "Fix sysui-studio build broken by ag/21408305." into tm-qpr-dev am: 9a73d2c2 am: a5858ebe

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



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