[automerger skipped] Merge "Add permission to the list of individually...

[automerger skipped] Merge "Add permission to the list of individually toggleable modules" am: 8bfd7fa7 -s ours

am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a54 is already in history

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



Change-Id: I8f1cfd31298085ba4b031047d5b07ed62086acb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>