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

Change-Id: Id4a52aaca3d94075ff179141e96fba5c7326d4ee