Merge "Fix uiservicestests" into udc-dev am: 9dfeef8c am: 417e158c

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



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