Merge "Don't do the SAW perm check if there's an invalid UID" into rvc-dev am: 67be1e7ae7 am: 391f175c1c am: b9409b46f1

Change-Id: If14b8642c785279eafd6185d47be2dc30068635d