Merge "[flexiglass] Fixes compose-enabled sysuig build." into udc-dev am:...

Merge "[flexiglass] Fixes compose-enabled sysuig build." into udc-dev am: 72ac3c9c am: d5ed5e86 am: 790303b1

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



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