Merge "Revert "Grant shell permissions for Airplane Mode to Shell to support...

Merge "Revert "Grant shell permissions for Airplane Mode to Shell to support CTS"" am: ec8ebce9 am: af364469 am: 59f5bcf8 am: d8a9174f am: bf5938b6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If19b490afef5f07b872da0b85af9856f5c3873fb