Merge "Revert "Access app op modes in UID state indirectly.""