Non-functionally simplify permission checking logic

This change is prework for fixing inconsistent permission enforcement
described in b/298338671.

Bug: 298338671
Test: Presubmit.
Change-Id: Ia445f02ed8102bab8dc4934156a796767db116ef
1 file changed