[automerger skipped] Merge "Add exemption check for...

[automerger skipped] Merge "Add exemption check for OP_SYSTEM_EXEMPT_FROM_SUSPENSION" into udc-dev am: d4793dbb am: 3be48742 -s ours

am skip reason: Merged-In I72b73324f64f330a9d1ee925dee64d42e0455548 with SHA-1 9a276332 is already in history

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



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