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

Change-Id: I20181b31316826ad4aefe99026ebbbf3784ae5be