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

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



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