Merge "keystore: Add flag for blobs to be unencrypted"
am 5678bacd: Merge "Remove keystore entries when app data cleared"

* commit '5678bacdffb6871b0d5b428548315cc3bba430bd':
  Remove keystore entries when app data cleared
resolved conflicts for merge of 6fb172b1 to jb-mr2-dev-plus-aosp

Change-Id: I49dcec1d43e7b8dbbb9b89e2454ec5d657e53e02
am ce370671: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'ce370671785630de03ce15ccf3568e10ff8edfd6':
  Import translations. DO NOT MERGE
AndroidKeyStore: Add encrypted flag

Add the encrypted flag for the KeyPairGenerator and the KeyStore so that
applications can choose to allow entries when there is no lockscreen.

(partial cherry pick from commit 2eeda7286f3c7cb79f7eb71ae6464cad213d12a3)

Bug: 8122243
Change-Id: I5ecd9251ec79ec53a3b68c0fff8dfba10873e36e
am 097ed01a: Merge "Revert GC thread changes" into jb-mr2-dev

* commit '097ed01adca362b7c3e49a9301aacbbf3415384a':
  Revert GC thread changes
am e4753968: Merge "Remove old KeyStore call sites" into jb-mr2-dev

* commit 'e47539684e1431a69893e45bcf9ace4f812edbc8':
  Remove old KeyStore call sites
am 7fa9667f: Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev

* commit '7fa9667f63fe84a2d17ce899121f32bfcec98864':
  Clarify how release of offline keys is handled in the MediaDrm API
am 919e36d5: Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev

* commit '919e36d5f689f6a73a879ebd72465f68c1625062':
  Allow non-system apps to use restricted accounts
am 3f1375e5: Merge "Enabling Face Unlock for user switching (bug 8495282)" into jb-mr2-dev

* commit '3f1375e50fa29c500f1ce746ec7421bf6afcd8ff':
  Enabling Face Unlock for user switching (bug 8495282)
am 30c990c3: Merge "Draw Operation merging" into jb-mr2-dev

* commit '30c990c361291ad578ef4ffe4a4dd0fd6080797b':
  Draw Operation merging
am 289e6497: Merge "Fully setup newly bound service before state management." into jb-mr2-dev

* commit '289e64974a3be70ff823ee0a0c1fe5ea32a832bb':
  Fully setup newly bound service before state management.
am 7af3d056: Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-dev

* commit '7af3d0560d130e877e6ce6a1c830efa7a945d436':
  Crash on non-eng builds due to lacking null check.
am 2570d0ad: Merge "keystore: remove old APIs" into jb-mr2-dev

* commit '2570d0ada876b94a91f9665c7469140ba0ddc712':
  keystore: remove old APIs
Merge "AndroidKeyStore: Add encrypted flag"
am 9fbc8f70: am edf2ab16: am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.

* commit '9fbc8f70b6ccdecc95c968ecdb9f8f823bd92857':
  Doc change: add policy guidelines documents.
am ed8cdbb7: Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev

* commit 'ed8cdbb780cda3701b433dd1d383bb88f180ff72':
  Fix CTS failure due to invalid EAP update
am bffe377b: Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev

* commit 'bffe377bca3cb8240bfc614c12fd1091ae3f69b9':
  Add logic to handle changes to file_contexts during update.
am a59a19ab: Merge "Fix issue #8512015: VideoView\'s window animates when its position changes" into jb-mr2-dev

* commit 'a59a19abb8f284beb478ff2492493251b91a2847':
  Fix issue #8512015: VideoView's window animates when its position changes
am 0985ac04: Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev

* commit '0985ac04310f18be7dd814b9a07c93f144ad21c2':
  Maybe fix issue #8620910: Win_sdk build failed and unable to create...