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

Change-Id: Ie3190f1daaf307037516de2c774172033b96af3d