Revert "Revert all recent app opps changes"

This reverts commit 3da0399808bfc3e45a99288ff9be8d10b34f4a07.

Conflicts:
	core/java/android/app/AppOpsManager.java
	services/java/com/android/server/AppOpsService.java