[automerger skipped] Merge "Return PO or DO for POLICY_SUSPEND_PACKAGES" into...

[automerger skipped] Merge "Return PO or DO for POLICY_SUSPEND_PACKAGES" into sc-qpr1-dev am: 3c7c22f4 am: 8155ff9b -s ours am: 688c69c2 -s ours

am skip reason: Merged-In Ice96fe5eb81b9049791b060287f0aea527868539 with SHA-1 aa8c5e8f is already in history

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

Change-Id: If9faa0c973139e1c082173060e526f6525f90529