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

Change-Id: Ic155670df78a6e779174cbd705f07260c8d305b6