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

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

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



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