Merge "Make CTS tests ambivalent to server impl" into udc-dev am: f5893312

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



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