Merge "At most one app should have OBSERVE_APP_USAGE" into pi-dev