[automerger skipped] Merge "getCameraIdListNoLazy : remove system cameras from mTorchStatus as well." am: b2f70b04d4 am: 3c83e580b0 -s ours am: d5e80336f6 -s ours
am skip reason: skip tag Change-Id I0a149ba3d93a740cfbfdc2d04c1235e648061156 with SHA-1 02622abbe2 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659167
Change-Id: I8c58965c54f44e4b4fdc3fdf1de47866009ee720
This commit is contained in: