Merge "Check permission on clearPassword and other CryptKeeper APIs" into nyc-dev
am: 1658fff3a9

* commit '1658fff3a92ce6ad13f41ce5faf7fcdfe3ca2673':
  Check permission on clearPassword and other CryptKeeper APIs

Change-Id: I03145596adfd67f016119408c95c6ba5f8f6b271