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

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



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