[automerger skipped] Merge "API Feedback: rename AddServiceWithFlag with...

[automerger skipped] Merge "API Feedback: rename AddServiceWithFlag with plurals (media)" am: 2557bfa7 am: 03afd150 am: ad87f8cc -s ours

am skip reason: Merged-In I3b9921fdd9f039714bdf6e789591f860f77d2834 with SHA-1 5b097ef6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2493115



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