merge in master-release history after reset to master
Merge "Import translations. DO NOT MERGE"
am e0544435: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit 'e0544435893f0078f4f21418249bf6633fa1d95c':
  Import translations. DO NOT MERGE
Call UI not showing for MO/MT call till pwr cycle

The device is staying in an  error state - neither MO nor MT calling UI can be shown until the device is power cycled.
[Root Cause]
 CallHandlerServiceProxy is requesting to binding service of InCallUI to launch Calling sreen.
 At the same time, the InCallUI process is killed by system so that the binding request is ignored/lost.
 CallHandlerServiceProxy keeps waiting for the service to connect but it will never come. Thus the Calling UI will never be showed until the device powers cycle.
[Resolution]
 Rebind the service if CallHandlerServiceProxy does not get service connected in 2 seconds.

bug:12078305

Change-Id: I7d6ce69379ec187abccadcf823a99549097fa0f5
Don't display gateway number on bluetooth

Display actual contact phone number instead of the Google voice
gateway number when there is a bluetooth connection with eg a car display.

Bug:11881222
Change-Id: I1a5b9d3dee4a490905e6e4b52745972fd63d81a1
(cherry picked from commit 21a7534fa69c1cc10809ae33fa0bfa84c5ac1309)
am 1c09481b: NPE in BluetoothPhoneService.java when switch users.

* commit '1c09481bdac9aa106c2dd4e6ab025d57f07e1a6f':
  NPE in BluetoothPhoneService.java when switch users.
am 21c52fad: am 1c09481b: NPE in BluetoothPhoneService.java when switch users.

* commit '21c52fad0fe1dd891202e78533bb131054a54e68':
  NPE in BluetoothPhoneService.java when switch users.
am b2bf8527: Don\'t display gateway number on bluetooth

* commit 'b2bf852766095659fdbf002f687f239f89ed9d1d':
  Don't display gateway number on bluetooth
am 8464bbd7: am b2bf8527: Don\'t display gateway number on bluetooth

* commit '8464bbd7fc6824d5fde3af2b6637a3795b0de7e9':
  Don't display gateway number on bluetooth
Merge "Call UI not showing for MO/MT call till pwr cycle" into klp-dev
am aca8066b: Merge "Call UI not showing for MO/MT call till pwr cycle" into klp-dev

* commit 'aca8066baec2505f388834cab0fad6608d13e2e4':
  Call UI not showing for MO/MT call till pwr cycle
am b69af5c1: am aca8066b: Merge "Call UI not showing for MO/MT call till pwr cycle" into klp-dev

* commit 'b69af5c11b3ae5a155b531aa9121950b542e4537':
  Call UI not showing for MO/MT call till pwr cycle
merge in master-release history after reset to master
Update to new extra data API

Use the new API which gets back an arbitrary Bundle (passed with the
incoming call intent).

Change-Id: I52e7e1d0788ecd01aa427e76de7ccf4d9b75f1f0
am 394390e0: am 21c52fad: am 1c09481b: NPE in BluetoothPhoneService.java when switch users.

* commit '394390e0ae4fa29238a2300607150dc4f528e364':
  NPE in BluetoothPhoneService.java when switch users.
am 90bedbd5: am 8464bbd7: am b2bf8527: Don\'t display gateway number on bluetooth

* commit '90bedbd5cc40c077c6ae04a1dafa0ba02872104d':
  Don't display gateway number on bluetooth
am ea0be866: am b69af5c1: am aca8066b: Merge "Call UI not showing for MO/MT call till pwr cycle" into klp-dev

* commit 'ea0be86687a3815b6a92abd1b25d358853ea3923':
  Call UI not showing for MO/MT call till pwr cycle
Add SET_TIME permission to telephony service.

Telephony service was throwing a SecurityException when trying to set
the system time after receiving a NITZ update. Add
"android.permission.SET_TIME" permission to the manifest.

Bug: 13174944
Change-Id: I4f096a61792fe5f349a4a97dae53efa5f70589a6
Merge "Add SET_TIME permission to telephony service."
am fe84e327: am 394390e0: am 21c52fad: am 1c09481b: NPE in BluetoothPhoneService.java when switch users.

* commit 'fe84e327efe3a52ba4d77fa211fe7fe91b7c77c4':
  NPE in BluetoothPhoneService.java when switch users.