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

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

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



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