Merge "Prepare for keeping concrete overrides of abstract methods" into main am: 7953818d

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



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