resolve merge conflicts of d2f08c15 to rvc-d1-dev-plus-aosp am: 15333e4b

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13002065

Change-Id: I47728ba5cbcc4369cddf18072fbfc1d3d3c63bce