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: 73a810b4

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



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