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

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



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