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

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



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