[automerger skipped] Merge "Merge Android R" am: 374a037174 -s ours am: 21ce9b3e4d -s ours

am skip reason: Change-Id Iab7fdea5e3abd2047d55e1a2c57ea700551ee03c with SHA-1 27203f54ed is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/audio/+/1422314

Change-Id: Ibe69c92d13ba33c2f1e91aa3d7f4bfdb5cd609e6