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

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



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