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

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



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