Reconcile with ics-mr1-release

Change-Id: I7169c991dc7e80c7969274f4f1f4072f3dd385b3
am d2a2b6c7: Import revised translations. DO NOT MERGE

* commit 'd2a2b6c7da2492a23104a080fd54756714a36873':
  Import revised translations. DO NOT MERGE
Reconcile with ics-mr1-release

Change-Id: I4c5d1e8313e58a0827051e0582059cdae4c180dc
am 9e01ecb5: Save network mode on GSM devices.

* commit '9e01ecb5466843c3d9bbb562ebae4835db6f4937':
  Save network mode on GSM devices.
Reconcile with ics-mr1-release

Change-Id: I2fd7f9712d7ed7834009a86940dd9766ab97fb4b
am 940067fb: Allow only NT_MODE_GSM_ONLY or NT_MODE_WCDMA_PREF

* commit '940067fb6ae30a26b7481e28acf7e3a00e9d06f3':
  Allow only NT_MODE_GSM_ONLY or NT_MODE_WCDMA_PREF
Reconcile with ics-mr1-release

Change-Id: I96e600cc3a719037fd2be835a0c335268076dfae
Make some fields of intrnl classes package-private

This makes a little more sense than `private` since they are accessed
outside of the class that they are defined in.

In addition, this fixes errors created by proguard when building with
OpenJDK.

Change-Id: Ib0dd2509f15da5ea3b27fe194b8cd8e9e8d8a776
Phone: Display Short Name/MCCMNC if Long Name is empty in manual search.

The operator name for each operator obtained in the Manual Network Search
should be derived as per 3GPP spec TS 22.101 A.3(Country/PLMN indication).
While deriving the name for current operator (already registered operator), as
per the spec if NITZ name has to be displayed, then some times the long name
can be empty in MM information. Since the operator information should be derived
from a single source, MM inforamtion cannot be combined with other sources
like ME DB information for long name. In such cases, Short Name or MCCMNC string
should be displayed in the Manual Network Selection.

Change-Id: Id6b8c63ecf8de48bd964780f39a83383cff12da1
am 671780e5: Import translations. DO NOT MERGE

* commit '671780e52a499c58ffbfb9d39f40a7034e7d5e39':
  Import translations. DO NOT MERGE
am d8baa6f8: Correctly hide in-call panel when dialpad is shown

* commit 'd8baa6f83a68d4243dbad92c693cf03d8ba7d1e0':
  Correctly hide in-call panel when dialpad is shown
am 40dcd14a: Disable horizontal detection during phone call

* commit '40dcd14ab398220dec2a25f812dde21899d109f2':
  Disable horizontal detection during phone call
Reconcile with ics-mr1-release

Change-Id: I4565209efafdb453db627b9482478612aec45ae4
am 73031492: Introduce vibration options for voicemail notification

* commit '73031492772779079308aa981ce5dc76655dc71a':
  Introduce vibration options for voicemail notification
am fcdab673: Merge "Fix in-call notification icon flicker when screen goes on/off" into ics-mr1

* commit 'fcdab67302256cbeaf950bd591b03d55e1917d85':
  Fix in-call notification icon flicker when screen goes on/off
Reconcile with ics-mr1-release

Change-Id: Ia9594222cbf31d6edc1a2c20b3978d7f780f9205
am 4bf466a6: Setup a flag to detect when the screen is on and we are in call mode.

* commit '4bf466a6d117a6fc4ddfd480f7db7606a29cb4ff':
  Setup a flag to detect when the screen is on and we are in call mode.
am cf391e1e: Import translations. DO NOT MERGE

* commit 'cf391e1e1884b76101d2912e71b384bab16f5cb2':
  Import translations. DO NOT MERGE
Reconcile with ics-mr1-release

Change-Id: Ib3be35645f4ba2ea01c9b536d75d58f4ceb2abc9
Merge "Phone: Display Short Name/MCCMNC if Long Name is empty in manual search."