Merge "Make Gps.KEY_PREFIX and Gps.KEY_PERSIST_LPP_MODE_BOOL Public" am: 2e321705a7 am: cd23bc8211 am: d9faf626f6

Change-Id: I7c3dc341068fb3f00bf54854cb5172bf901a28e8