[automerger skipped] Merge "Grant shell REBOOT permission" am: a656dd889d am: 1e43248938 am: 8c8286f8d5 -s ours
am skip reason: Change-Id I4545c4f3587fee2840a00648c569f75bb57501fc with SHA-1 1ef721380a is in history

Change-Id: I383f294fd043547830a3a369f4f93fcd86897a54