Camera2: Do not pass location info for startActivity case am: 3c097bb0e5 am: a73f9d3e0d am: e43bba16fc am: ba5dd7a1af am: f451da03d5 am: c4cd166386 am: d58eeff54f am: a0abba23df am: 5d159d58a0 am: 6581739e2e

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

Change-Id: I75604662de988ee7b71f889eaffafcaa1167ef2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>