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

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



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