Merge "Keystore 2.0: Add watch dog instrumentations in the calls into keystore."