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

[automerger skipped] Merge "cameraserver: Enforce system camera rules for setTorchMode and torch callbacks." into rvc-qpr-dev am: 48132b70 am: 145a4ce2 -s ours am: 139633df -s ours

am skip reason: skip tag Change-Id Ic849aa91e4d953f45ed99efae997e45671d116b3 with SHA-1 8c62d898 is already in history

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

Change-Id: I1f4bfa765d0ac1eb3226ba5271f8a8fe1f514e05