Merge "Add MANAGE_SENSOR_PRIVACY to shell permissions" am: 3a0640daea am: a77d6ade93

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d356930c03256bebcd631a88d7845e676a00eee