Merge "Merge "AudioFlinger: Fix spurious underrun logging" into rvc-dev am: 54cc1e3c am: e7c9e268" into rvc-d1-dev-plus-aosp am: 219254be

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

Change-Id: Ia4c992684e15afeb49bc743254524f7228eee037