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

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

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