Merge "Update PM#checkSignatures by uid to support pre-key rotation behavior" into rvc-dev am: 3369bbd82a

Change-Id: Ief40fa1a56975b79f6bc6bce10cc226cd3b4033c