Merge "Add @hide isEmergencySmsMode API for GPS location override" am: 4f8d4d8770
am: 3bbfee2ab4

Change-Id: Id3e43a9f15f7e5c760707c577a46bf825e4c3cee