Merge "Set UID appops mode instead of package appops mode"