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

Change-Id: Ic7e643a2b7ab12a9d1443856a616e31484fe491d