[automerger skipped] Merge "Add MANAGE_SENSOR_PRIVACY to shell permissions"...

[automerger skipped] Merge "Add MANAGE_SENSOR_PRIVACY to shell permissions" am: 3a0640da am: a77d6ade am: 7126eb99 -s ours

am skip reason: Change-Id I8a56b70c928b7ddd3904c2e9533578b531d81757 with SHA-1 9340d25c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica2fad395ede04e1294c74fe30a19ccddc8a2d4e