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

Change-Id: I1c70471deaa3991945d2950d1c6e0f5bc90805b4