[automerger skipped] Revert "DO NOT MERGE: pinner: Toggle camera pinning on by default" am: 599a834102 am: 361d493a56 am: a189e486a1 am: 834b66c034 am: 474fa963cb -s ours
am skip reason: subject contains skip directive Change-Id: Icadeed86775c8e1026ef3ec3e984da8d778ab791
This commit is contained in: