Merge "Add bta::sys::bta_sys_eir_unregister" am: cc5e1159 am: 8e48a7e1

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



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