Merge "Loads gps_debug.conf from vendor path before system path" into udc-dev...

Merge "Loads gps_debug.conf from vendor path before system path" into udc-dev am: 8fa31710 am: 99d921e3

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



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