Merge "Update device policy APIs after linter fix" am: 0eb6bb9281

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

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