Merge "Add owners for KeyChain code" am: 0f9319ed1b
am: d7fd57224d

Change-Id: I30f0d7060cb61a26efcddb5cd4e2119907a4f63e