[automerger skipped] Merge "Move version in apex_manifest am: fa4d1e3b am: 77084e1f" into tm-d1-dev-plus-aosp am: af4f99e1 -s ours

am skip reason: Merged-In Ib198d65c7c653c6185120ec179f6c937b20ab51b with SHA-1 fa4d1e3b is already in history

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



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