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