[automerger skipped] Merge "Fix DevicePolicyManager.isBackupServiceEnabled() breakage." into rvc-qpr-dev-plus-aosp am: 413001ee -s ours

am skip reason: Change-Id I11d863229c4d62a058aaf37446a694b9c73ae5b8 with SHA-1 630dec9e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I440b845e3afbd0dfd8fbb58c11262e8149ec543d