Merge branch 'security-aosp-tm-release' into int/13/fp3

* security-aosp-tm-release:
  Camera2: Do not pass location info for startActivity case

Change-Id: I7fc6e578958c3da03ec171722c6c07ded1565eda