Merge "Disable On/OFF switch before action"
am b514a95c: am 4abe488a: Merge "No back icon in action bar of APN Settings"

* commit 'b514a95ce7009a61532f00d4ac5ab73861d2b327':
  No back icon in action bar of APN Settings
am 966c2d3f: am b514a95c: am 4abe488a: Merge "No back icon in action bar of APN Settings"

* commit '966c2d3fc61a1fed5c5e587c6ef29b2b68d01372':
  No back icon in action bar of APN Settings
Make TTS language setting track system language.

TTS engine default locale is set independently from the system locale.
If TTS engine default locale is not set, it defaults to the system locale.
If user decides to set TTS locale, ability to default to the current system
locale is lost (until device is wiped).

This change makes settings wipe the TTS engine default locale value if user
selects language that is system language. This allows TTS to track system
language if user changes it.

If system language is not available in TTS, language field is set to
"language not selected" value.

This change require a small change in framework/base to make previously
private method public (TtsEngines.getDefaultLocale).

+ Selected language is displayed in language preference summary (matches
all other language preferences)
+ Removing and then adding "language" and 'install languages' preferences
looks glitchy, not they are disabled (grayed out) if unavailable.

Bug: 8613986
Change-Id: Ic4bde97ef7406adb64cc03efbe660275360ba3af
merge in master-release history after reset to master
Reconcile with jb-mr2-release - do not merge

Change-Id: I6a178af29be7f1d227b667ec84312f5d0c2fdadd
am 7e18ed8c: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '7e18ed8c14ca2047a5f82f2eb8bcab93d673d730':
am 0b2781ae: Write restriction bundle right away for required apps.

* commit '0b2781ae537e6d3d27863080eea0a0a5fa6c83b8':
  Write restriction bundle right away for required apps.
am 18d44684: am 0b2781ae: Write restriction bundle right away for required apps.

* commit '18d44684d3d384cc1eed114808c3870c7738e352':
  Write restriction bundle right away for required apps.
Reconcile with jb-mr2-release - do not merge

Change-Id: I2a202b7c38568ae9ca45a38cc01f08be05ab5d23
am ae006e70: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'ae006e7077c9937bd90d08f7eea7fb7e580b1d57':
merge in master-release history after reset to master
am 8274b677: Fix issue #9074296: Device Admins can activate in a way...

* commit '8274b6770219a469ab8a5254206d0d81bd5c96d3':
  Fix issue #9074296: Device Admins can activate in a way...
am eeeccdc6: am 8274b677: Fix issue #9074296: Device Admins can activate in a way...

* commit 'eeeccdc6a3ab5640233ff46dc8864c1235687f09':
  Fix issue #9074296: Device Admins can activate in a way...
am 7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev

* commit '7229e29f1749ae10bd92b59ec3d663698a5045e7':
  Ensure all active Device Admins are listed.
am 1eb2064f: am 7229e29f: Merge "Ensure all active Device Admins are listed." into jb-mr2-dev

* commit '1eb2064ff495b60bbf5db1a188adcad2e677742b':
  Ensure all active Device Admins are listed.
am 21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev

* commit '21f008e1f4e2d5e84fdab041d2ef31f305bbcf09':
  Update strings for clarity about restricted profiles
am 73662629: am 21f008e1: Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev

* commit '73662629957e03ef23cd1bc33640ce7d1e690e90':
  Update strings for clarity about restricted profiles
Import translations. DO NOT MERGE

Change-Id: I5c46faf0aa951cad097747f89fc4427e83bafa1a
Auto-generated-cl: translation import
Reconcile with jb-mr2-release - do not merge

Change-Id: Ide88244c344b65f9c0c84b40e4ca76bccf67584c