[automerger skipped] Merge "Add permission to the list of individually toggleable modules" am: 8bfd7fa7d6
-s ours am: 1675ebe0a7
-s ours am: 3bf76f727c
-s ours am: 79c7dbd3e8
-s ours
am skip reason: Merged-In Id4eb9ba0da8a05c41d3b29b1cb8fa1d2d485c7b9 with SHA-1 86251a5450
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2151255
Change-Id: I38ca173114fe6049025562ce47211eefdec86c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: