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

Change-Id: I0d11cc0db63df563f78265efdfee716aa82a6905