[automerger skipped] Merge "[DO NOT MERGE] Cleans up Config.java" am:...

[automerger skipped] Merge "[DO NOT MERGE] Cleans up Config.java" am: 80522e9f am: 98c1fc50 am: a016cf86 -s ours am: 44d87f11 -s ours

am skip reason: subject contains skip directive

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



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