[automerger skipped] Revert^2 "Add addService to pass in dump priority flags." am: 40ed6a0e31 -s ours am: 21c13cad05 -s ours

am skip reason: Merged-In I59a3fa3662ae253b5d2ab89071603a6e6eb81349 with SHA-1 acb3a5a9b2 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3123441

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