am 22a257db: am 59f9592f: am 2301174e: Merge "Add KeySetManagerService unit tests." into mnc-dev

* commit '22a257db8046c4cc08940d4198c0ba12fddd280b':
  Add KeySetManagerService unit tests.