[automerger skipped] Add missing return and test for volume check am:...

[automerger skipped] Add missing return and test for volume check am: c96c3553 am: bb413330 -s ours am: 572df67e -s ours

am skip reason: Merged-In I6dce4c7afb78a93dca8ba7fcbd02aa5350f18c1a with SHA-1 c96c3553 is already in history

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

Change-Id: I1dcf557c842397bd44f878cf2f2d199944fbbe5c