Merge "OOM-adjust an app to the foreground for startForegroundService" into oc-dev