Merge "Combine the checks for DO/PO in isAdminAffectedByRestriction()." into udc-dev am: 5bbe99a2 am: 4738938b

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



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