[automerger skipped] Merge "API Feedback: rename AddServiceWithFlag with plurals" am: 548fd9af am: 37189598 am: 90d9896d -s ours am: 4873f76b -s ours

am skip reason: Merged-In I0c31ef78f187be728e7c86c429a670b3a9081b36 with SHA-1 d5471701 is already in history

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



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