[automerger skipped] Merge "Make the Settings permission a required module" am: 480b56e3d6
am: bc79e6e6f3
am:850fdb32e9
-s ours am skip reason: change_id Ia2548355282498bceeffddb564de32a6cb857c66 with SHA116322a0271
is in history Change-Id: Iab476273c6b332525177fe76f5f8d779ffe0f0c7
This commit is contained in: