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

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

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