[automerger skipped] Merge "Add gps_debug.conf module" am: 20e6f31923 am: e925463f3b
am: 1036e02328  -s ours

Change-Id: Ief2ddc7edccb04dbf5c2f1c2a0483187f741dcf9