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

Change-Id: I0950e4c2ca9cf53bdab7139f79545e77ae9060dd