[automerger skipped] Merge "DO NOT MERGE Revert "[NetworkSuggestion] Fix...

[automerger skipped] Merge "DO NOT MERGE Revert "[NetworkSuggestion] Fix getEnterpriseConfig"" into rvc-qpr-dev am: 2bbbe141 am: 8bfda849 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I78f59dbf50e7f334f372359039697cf24b0e79eb