Merge "Add back an ignored test." into udc-qpr-dev am: 59a80395 am: 09436ed9

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



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