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

Change-Id: I9b654b4d2e01785a9bc19e985062395073718e7f