Merge "audio: replace speaker to speaker safe if ring is active" into sc-dev am: 34891dbf am: 99a69930 am: b4d7e462

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

Change-Id: I5060525ca279acbd0a66e5162e69d492d983d762