[automerger skipped] Merge "Add some app modules to the allowed whitelist."...

[automerger skipped] Merge "Add some app modules to the allowed whitelist." am: 4a19d08d am: 46b02790 -s ours

am skip reason: Change-Id Ia7adf690cd6dca1408ae0a340860eaeae6c1d4b4 with SHA-1 55576055 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1290961

Change-Id: I49475cdb9416b0fc5fc4d508bd205fd641bbe199