Merge "[BUG] AudioService: fix stategy/groups attributes introspection" am: d3cd42362b am: b2297eefe7 am: a4d5b622d6

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

Change-Id: I4ec1c9fc2ddd7e7cf2a5a8df43ae2699b7c8c79b