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

* commit '9959cc879252fff1f20946f430aa1c5b9574f7fb':

Change-Id: I5e67954d7d2a1780892bd3ccc4a20d8f568e5726