[automerger skipped] Merge changes from topic "Handle Shutdown Intent" am:...

[automerger skipped] Merge changes from topic "Handle Shutdown Intent" am: bd01f52b am: c5741e17 am: 95f48fa1 -s ours am: eef0f1f3 -s ours

am skip reason: Merged-In I6330d2f94fe7a5ca582df83c9fa32c5c6cba5186 with SHA-1 bfa86649 is already in history

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

Change-Id: I085389b54f8d069f648cd13339d114ba04b88885