merge in master-release history after reset to master
Ensure all active Device Admins are listed.

Bug: 9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
Fix issue #9074296: Device Admins can activate in a way...

...that makes it impossible to deactive/uninstall them

Don't allow device admins to directly launch the add UI if
they are malformed.

Change-Id: I0d3140222d8015f680e1f199bddae2221ee0e726
Update strings for clarity about restricted profiles

Bug: 9051422
Bug: 9051178
Change-Id: I1b88286fdd0db27bb6980d0ebbc846370fd0082e
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...
Merge "Ensure all active Device Admins are listed." into jb-mr2-dev
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.
Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev
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: I42d8fcaccbdec16d54e85adcd73e4c455097715d
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I5c46faf0aa951cad097747f89fc4427e83bafa1a
Auto-generated-cl: translation import
merge in jb-mr2-release history after reset to jb-mr2-dev
Reconcile with jb-mr2-release - do not merge

Change-Id: Ide88244c344b65f9c0c84b40e4ca76bccf67584c
am 2dafd362: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '2dafd362c7052f1618b0d22d18043d99f4544ac0':
Merge "Import translations. DO NOT MERGE"
am 6fa5e627: Import translations. DO NOT MERGE

* commit '6fa5e627b8fd64af6e4ae286c46b3666b66f8d8a':
  Import translations. DO NOT MERGE
am 5c20af4c: (-s ours) am 6fa5e627: Import translations. DO NOT MERGE

* commit '5c20af4c7c45e3da2150937d222f85c80b0965b8':
  Import translations. DO NOT MERGE