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

Change-Id: Id8528c3b1c499cdab621479d27e52969f22ac22f