Merge "Add flag for pip2 implementation" into udc-qpr-dev am: 080cc5965e

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

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