Merge "Fix cannot handle with empty line in config file" am: d80dfef9 am:...

Merge "Fix cannot handle with empty line in config file" am: d80dfef9 am: b81b0428 am: f2d40486

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



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