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

Change-Id: I7bde04186d954f9e1b41c837d1466fb74f95ae74