Merge "Add command to allow setting of some permission flags from shell" into...

Merge "Add command to allow setting of some permission flags from shell" into tm-dev am: 4f8cd5ab am: b467e647 am: 6109fec6

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



Change-Id: I063cc8d855a2b77ba32869988589efc7fb49f934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>