Merge "Allow device/profile owners to change app ops modes." into pi-dev
am: adaca2146d

Change-Id: I23dc01f573266a182fff2106318b867920a3f91a