[automerger skipped] Merge "Unhide API setAllowedNetworkTypesForReason and...

[automerger skipped] Merge "Unhide API setAllowedNetworkTypesForReason and getSupportedRadioAccessFamily" am: ab1fbb18 am: cf775da1 am: 52f157a2 am: 7fd397a3 -s ours

am skip reason: Merged-In I758cad74296e59618122853f479ad4f0c261d726 with SHA-1 cc097296 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1973439

Change-Id: I7781ef82a34e2e3f2dab3d44125017f9a20d18bf