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

[automerger skipped] Merge "Merge "Return PO or DO for POLICY_SUSPEND_PACKAGES" into sc-qpr1-dev am: 3c7c22f4 am: 1ae887c0" into sc-v2-dev-plus-aosp am: 304e45de -s ours

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

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

Change-Id: I0b6d24400fdf7d7f4fb2e5ee5da48a0ec449ab0c