Merge "fix type ignore position after formatted" am: e7dc1c41 am: 0f63aaf0

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



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