[automerger skipped] Merge "cameraserver: Enforce system camera rules for...

[automerger skipped] Merge "cameraserver: Enforce system camera rules for setTorchMode and torch callbacks." am: 5b68d9c1 am: 9dd25270 -s ours am: 5c1026b4 -s ours am: e3c9d97d -s ours am: efdfe907 -s ours

am skip reason: Merged-In Ic849aa91e4d953f45ed99efae997e45671d116b3 with SHA-1 aa6e3ea9 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1658768

Change-Id: If99b59b5d8a7944fcfa1754e8d79a1cb98f58e09