Merge "audio: replace speaker to speaker safe if ring is active" into sc-dev am: 34891dbf am: 56fd7efb

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

Change-Id: Ied26d07a2215e62811bc4999c1b53beb2005d87f