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

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

Change-Id: I2147cee250e81f4afdc804808c7cd85131927ccb