[automerger skipped] Merge "Add some app modules to the allowed whitelist."...
[automerger skipped] Merge "Add some app modules to the allowed whitelist." into rvc-dev-plus-aosp am: 6c27abd2 -s ours am: f6b4c9e3 -s ours
am skip reason: Change-Id Ia7adf690cd6dca1408ae0a340860eaeae6c1d4b4 with SHA-1 cbd35ff5 is in history
Change-Id: I94ba09dd8b7e7903f43f8384821acb938529c085