[automerger skipped] Temporarily add support for conditional modules am:...

[automerger skipped] Temporarily add support for conditional modules am: 07a1295c am: a5b65933 am: d4d72cfa am: 870c2791 -s ours

am skip reason: Merged-In I7704a884675eb58c429a59f99a663cf09807ecec with SHA-1 a8e3488c is already in history

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

Change-Id: I0505c6912908495a82b4ad6f61ca28a62426aadb