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

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



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