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

Change-Id: Ie6834e8640f3661407c99a9f1dbb8375dddc706e