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

# Via Android Git Automerger (2) and others
* commit '0c86885888512b120e8691164799e06adb653b72':
  Track keystore binder changes