am fbed306f: am b0f4b8a7: Merge "Track keystore binder changes"

# Via Android Git Automerger (1) and others
* commit 'fbed306fb9fe1a989a29c94d210e227ac07c2a03':
  Track keystore binder changes