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

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

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