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

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



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