Merge changes from topic "RKP_metrics" * changes: Add Security Level and the four key states to RkpPoolStats Remove obsolete keystore2 atoms.