Merge "Removing binder access to deprecated KeyStore function reset" am: 9eb7fcfba6
am: 0ae9cd3faa

Change-Id: I26ddf960c24e3a8706fc32fbaabe54e772ff9e02