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

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



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