Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5 am: c4cd166386 am: d650480470 am: b4193567d9 am: fc44b18b72

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/25135945

Change-Id: I3411a7ece97b305b90c17ebf135d618171bba276
Signed-off-by: Automerger Merge Worker <[email protected]>