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

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



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