Merge "Turn down the preliminary foreground service API" into oc-dev
am: 00ed0baca8

Change-Id: I50fba7a59e4f52500f4708e194864dc9dece8c71