Merge "btif: av: minor refractory to have a more comprehended state update"...

Merge "btif: av: minor refractory to have a more comprehended state update" am: 3d4db3aa am: f5284438 am: 6db6e139 am: 8ec7cfce

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2219640



Change-Id: Ic27c01a4d7f0830d26ef48778c12b456bfc30639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>