Merge "Grant shell permissions for Airplane Mode to Shell to support CTS" am: a8cc70b502 am: d1d3e03659

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5fb1ea1ca298cd0f4275c42b94d027c9c3c53b7