Merge "Allow Advertiser, DiscoveryManager runtime toggle" am: e32490944b

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

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