Merge "Make Gps.KEY_PREFIX and Gps.KEY_PERSIST_LPP_MODE_BOOL Public" am: 2e321705 am: cd23bc82 am: d9faf626 Change-Id: I7c3dc341068fb3f00bf54854cb5172bf901a28e8