Merge "Add device type metadata key: carkit + hearingAid" into main am:...

Merge "Add device type metadata key: carkit + hearingAid" into main am: 1b885617 am: 4cf940ca am: c9e98ba2

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



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