Reconcile with ics-mr1-release

Change-Id: I078f0b904d665abe2050b986b952bc714a706019
am 51adfd9c: Reconcile with ics-mr1-release

* commit '51adfd9c8b652f3c1ef176abf3788e5e27f56712':
merge in ics-mr1-release history after reset to ics-mr1
Import revised translations.

Change-Id: I057d4f0cafa5d08e4048e4fd437e69a023f5edb7
am b5023d25: Import revised translations.

* commit 'b5023d25d2c0cd21c9843567a2cafb009111d72d':
  Import revised translations.
Show screen saver toggle on tablets.

Bug: 5669263
Change-Id: I16ca00ff96b17cc367c4f6fa4260da5a08480ac0
Import revised translations.  DO NOT MERGE

Change-Id: Ia5368f1dffbd304e7b95d91f2a64acdc76381fa6
am 21b5d18b: (-s ours) Import revised translations.  DO NOT MERGE

* commit '21b5d18bcbb15ce2571aab8b60a7aca8971ef7a7':
  Import revised translations.  DO NOT MERGE
am 22c79cfa: am 21b5d18b: (-s ours) Import revised translations.  DO NOT MERGE

* commit '22c79cfa1b7298dfb6a90881fbc801fa652b916f':
  Import revised translations.  DO NOT MERGE
am 21b5d18b: Import revised translations.  DO NOT MERGE

* commit '21b5d18bcbb15ce2571aab8b60a7aca8971ef7a7':
  Import revised translations.  DO NOT MERGE
Add wifi direct settings UI

- Use switch for toggling
- Follow string and UI suggestions from UX folks

The goal is to keep the interaction minimal - PBC is used when possible and keypad/display
are used only if really necessary

Bug: 5332330
Change-Id: I83e91ad3a393c143e70f1f2b6a842b95eacde404
Merge "Show screen saver toggle on tablets." into ics-mr1
am a6ff69ed: Merge "Show screen saver toggle on tablets." into ics-mr1

* commit 'a6ff69ede0fa9868464a1a7059cad8fb3838c5ab':
  Show screen saver toggle on tablets.
merge in ics-mr1-release history after reset to ics-mr1
am a6ff69ed: Merge "Show screen saver toggle on tablets." into ics-mr1

* commit 'a6ff69ede0fa9868464a1a7059cad8fb3838c5ab':
  Show screen saver toggle on tablets.
Pulling screen savers for now. DO NOT MERGE.

Bug: 5689684
Change-Id: Ida6f23484c91d1cde539fc4a64e467970fa1fdb3
Reconcile with ics-mr1-release

Change-Id: Idbff6b6c73a4e5c68769504f39b47239df431476
am cfd97b59: am a6ff69ed: Merge "Show screen saver toggle on tablets." into ics-mr1

* commit 'cfd97b59f222f2b56fd90fcd4c0bf65023d59724':
  Show screen saver toggle on tablets.
am 7129322d: Reconcile with ics-mr1-release

* commit '7129322d0685059e925fc692ef9b1c48c5ff3128':
Allowing FaceUnlock with a PIN fixes 5467194

We need to allow FaceUnlock if the backup lock supports encryption (PIN).
This requires changing the way the minimum encryption quality is enforced
to allow FaceUnlock as long as the backup lock is a PIN, as FaceUnlock
is considered a lower security than the minimum for encrypted drives.
This change adds some complexity to upgradeQualityForEncryption because it's
used in two places: once to grey out selections that aren't sufficient
security level, and second to force the user to use a higher security level.
This still increases the minimum security level,
but makes an exception for FaceUnlock if it's allowed without encryption.

This uses a MutableBoolean to provide a mutable boolean capability.
We could instead write a custom one or use some other type of mutable
boolean if it exists.

In CryptKeeperSettings, using getKeyguardStoredPasswordQuality directly instead
of getActivePasswordQuality is simpler, but this uses a more complex approach
with a minor tweak as jaggies suggested it and it is clear about the
biometric exception being made.

Change-Id: Ia2645d6bd98857c79c6a9be45eda98087bfe517a