Merge "API Feedback: rename AddServiceWithFlag with plurals (media)" am: 2557bfa755

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

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