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

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

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