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: ffaa437e
* commit 'ffaa437e':
Change-Id: Ib33bb2c90d3c0e0efcd95af0d219f89719f1563d