Merge "Let the foreground service channel be blocked" into oc-dr1-dev
am: 6614a2e5d0

Change-Id: I5d1e93740b2a53c7cb85fc105bca6863f7e27577