Merge "Merge "Let the foreground service channel be blocked" into oc-dr1-dev...
Merge "Merge "Let the foreground service channel be blocked" into oc-dr1-dev am: 6614a2e5" into oc-dr1-dev-plus-aosp
am: d80b81ff
Change-Id: I05152c40422c7efa0b8a5aa3bbed2f54f07cb04a