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

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

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



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