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

Merge "Merge "[flexiglass] Fixes compose-enabled sysuig build." into udc-dev am: 72ac3c9c am: e0b27bf7" into udc-d1-dev-plus-aosp am: 4cad627f am: 86df76de

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



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