Merge "Copy the SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE definition to cts." into tm-dev