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

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



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