Merge "Restore advertising enable parameters onResume" into main am:...

Merge "Restore advertising enable parameters onResume" into main am: 1205b555 am: b54f03b1 am: 3c83da2f

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



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