Merge changes I8c01f31d,I0a2b90d1,I78bfa0d1,I803f9df1,I3ad42802, ... into tm-qpr-dev am: d83bec7048

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

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

media/java/android/media/audiopolicy/AudioProductStrategy.java

@@ -234,6 +234,15 @@ public final class AudioProductStrategy implements Parcelable {
         return mId;
     }
 
+    /**
+     * @hide
+     * @return the product strategy ID (which is the generalisation of Car Audio Usage / legacy
+     *         routing_strategy linked to {@link AudioAttributes#getUsage()}).
+     */
+    @NonNull public String getName() {
+        return mName;
+    }
+
     /**
      * @hide
      * @return first {@link AudioAttributes} associated to this product strategy.