Merge "Merge "Check permission on clearPassword and other CryptKeeper APIs"...
Merge "Merge "Check permission on clearPassword and other CryptKeeper APIs" into nyc-dev am: 1658fff3 am: 9959cc87" into nyc-mr1-dev-plus-aosp
am: 9651caaf
* commit '9651caaf':
Change-Id: I5fc97411ddf506a693a8f18857a962e2860617c7