Merge "Merge "Edit workPolicyUtil constructor" into tm-dev am: c39095ff am: 95daa85b" into tm-d1-dev-plus-aosp am: 2fa674d5

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



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