Temporarily add support for conditional modules am: 07a1295cfa am: a5b659334f

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

Change-Id: I8b2666bf768c2c851cdd8633cc8f30439ed58b57