[automerger skipped] Merge "Revert "DO NOT MERGE: pinner: Toggle camera pinning on by default"" into rvc-dev am: ae7d379be4 am: 2ed450750a am: b4a2268194 am: 8cc13e29df am: 4d0823a2e9 -s ours
am skip reason: subject contains skip directive Change-Id: I54c43aee3a9d004b9eff5b76bda6627076f6bfe3
This commit is contained in: