[automerger skipped] Merge "Re-order stack startup/shutdown with btm" into...

[automerger skipped] Merge "Re-order stack startup/shutdown with btm" into tm-dev am: c930c531 -s ours am: eaae04d9 -s ours am: 657839ff -s ours

am skip reason: Merged-In Iba0ddc183aa8b45156d76d64f5473baf3e2f65fd with SHA-1 01836f52 is already in history

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



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