Merge "Add SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE to the list of permissions granted to ASSISTANT and SHELL." into tm-dev