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

Change-Id: I80b29a9d5d2feb487f7b78cdece30ff738227b68