Merge "Camera: Remove GPS_LOCATION if set is called with null" into udc-dev...

Merge "Camera: Remove GPS_LOCATION if set is called with null" into udc-dev am: 2acd6320 am: 4b1e4ff1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21853665



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