Merge "Don't try to auto-pip if there's already a pip" into udc-dev am:...

Merge "Don't try to auto-pip if there's already a pip" into udc-dev am: bf7fe4a4 am: 8aacc155 am: 88dfd1c2 am: 6524a637

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



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