Merge "Add separated Pip1 and Pip2 dagger module" into udc-qpr-dev am: 9fbfc99b am: 10bf7978

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



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