keystore: add API to query storage type

Add an API to query the HAL to see what kind of storage it reports the
device is.

Change-Id: I37951e989ad724e2352df6e321f03f19e58b4fca
Merge "keystore: add API to query storage type"
am 1f8dcc58: Merge "keystore: add API to query storage type"

* commit '1f8dcc58c72d5a1bbebd66e21e65adfee76abc0c':
  keystore: add API to query storage type
keystore: command to clear all keys for UID

Add ability for system UID to clear all entries for a different UID.

Bug: 3020069
Change-Id: Ibfeea6aae9006cb2ef7052ead72b2704dfce3cb4
Merge "keystore: command to clear all keys for UID"
am 2ecc7a1e: keystore: command to clear all keys for UID

* commit '2ecc7a1efbb21d86d38b9e0348dfbf0e1213d920':
  keystore: command to clear all keys for UID
am 1b9f063e: Merge "keystore: command to clear all keys for UID"

* commit '1b9f063e7d34e03393c8eaa631baf7612b7dd48c':
  keystore: command to clear all keys for UID
keystore: fix upgrades

During an upgrade, a blob would be written out to disk. Whenever a blob
is written to disk, it is encrypted in-place. After upgrade, keystore
would attempt to use the blob, but get garbage instead of what it
expected since it was encrypted.

This moves the work of writing up a level so it can then re-read the
blob after upgrade.

Bug: 7249554
Change-Id: I3946c5db1c2fc57ace476db04f792e3b82d1cb15
Merge "keystore: fix upgrades"
am 7a310fbb: keystore: fix upgrades

* commit '7a310fbb5815b3c1ad965d58f4976afca2a721c6':
  keystore: fix upgrades
Fix CL split and build

Change-Id: Ie96b2d22af839b67daed4f194e37864cd50e8463
Merge "Fix CL split and build"
am 2ca3b1b2: Fix CL split and build

* commit '2ca3b1b25e8ceb841396061a318d3a043cbfcb54':
  Fix CL split and build
keystore: fix inverted hardware keystore check

Check should be that the 'is_software' flag is off.

Change-Id: Ic03ef957f6aa62b959b24fe8e4ff202f431aab89
Merge "keystore: fix inverted hardware keystore check"
am 4d93d246: keystore: fix inverted hardware keystore check

* commit '4d93d24624f270f024b7d4b9d3bf6c11a1e209a6':
  keystore: fix inverted hardware keystore check
resolved conflicts for merge of a2f747d4 to jb-mr2-dev-plus-aosp

Change-Id: If79ba99ef01c8216b1cce5daffc98a989255ac84
Merge "resolved conflicts for merge of a2f747d4 to jb-mr2-dev-plus-aosp" into jb-mr2-dev-plus-aosp
am 77c4e48e: Merge "Fix CL split and build"

* commit '77c4e48e80b989cb80599a40fbbad9a16745d89f':
  Fix CL split and build
am 56995079: Merge "keystore: fix inverted hardware keystore check"

* commit '56995079413e918d3676a97d70a1700379ba5321':
  keystore: fix inverted hardware keystore check