Merge "Minor refactoring in WorkPolicyUtils" into tm-dev am: 9cb05eaa am: 5eee437d am: d813e026

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



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