Merge changes Ib6415145,Ifde98a8c

* changes:
  Adjust the location update frequency for emergency calls
  Fix issue that the connection icon is placed a little left from center
tree: f094ae078807e0486617bc958b984cc9521d5fd9
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE