Merge "Revert "audio: prefer STRATEGY_SONIFICATION when ringotne is active"" into sc-dev am: 74dcdac0 am: 13b1b987

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

Change-Id: I894d6964a8088085662fa1c5be39b16d1f0b3e33