Merge "Revert^2 "Ignore testSetPolicyLevel_Adaptive"" into udc-dev am: de3202df23 am: 2139011282 am: bd1bba33ba am: 0b00dff081

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

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