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

Change-Id: I8e8d072dbf3edcb53eb32f86e0898c1bef791267