Merge "Revert^2 "Ignore testSetPolicyLevel_Adaptive"" into udc-dev am: de3202df23 am: 48ea737469

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

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