Merge "Don't attach pipeline to group expansion mgr." into udc-dev am: d77e6968 am: e9975599

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24148304



Change-Id: I54ce38a0a379a189440d4d22073013768c595316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>