Merge "btif: av: minor refractory to have a more comprehended state update" am: 3d4db3aa

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



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