Merge "OOM-adjust an app to the foreground for startForegroundService" into oc-dev
am: 305d30f786

Change-Id: Ifb52cf1189b3aa15b7bee12e1071130e77bef5d1