am 2301174e: Merge "Add KeySetManagerService unit tests." into mnc-dev

* commit '2301174eb3598a3290b5c56aae36b19b2c6743ac':
  Add KeySetManagerService unit tests.