Merge "Merge "AudioFlinger: Fix spurious underrun logging" into rvc-dev am: 54cc1e3c43 am: e7c9e26817" into rvc-d1-dev-plus-aosp am: 219254be93 am: bf2b40b1b1

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

Change-Id: I3181d666ae23b0688657d59fe13ca60c56c3d15f