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

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

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