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

Change-Id: I7218c9240dd4e24d561959d2bd7b53c022df0b56