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

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

Change-Id: I8daeef87aa87cdd5d7403e6d0d9d73f772781478