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

Merge "Restore advertising enable parameters onResume" into main am: 1205b555 am: 41ef8d60 am: f62eae18

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



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