Merge "HFP1.9: make variable name more readable" am: e343113f am: 56551d41...

Merge "HFP1.9: make variable name more readable" am: e343113f am: 56551d41 am: 4a423b0c am: a5a7b475 am: 3d71acd2 am: d4879819

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



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