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

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

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