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

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



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