[automerger skipped] Merge "Add Low Power Standby support to...

[automerger skipped] Merge "Add Low Power Standby support to NetworkPolicyManagerService" am: 7881ffd0 am: d24f1ade am: d6c02d37 -s ours am: 753b4d52 -s ours

am skip reason: Merged-In I6c554df71b12bcf06f1c98ef70c35242bc90a689 with SHA-1 452ab99d is already in history

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



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