[automerger skipped] Merge "[NetworkSuggestion] Fix getEnterpriseConfig" into...

[automerger skipped] Merge "[NetworkSuggestion] Fix getEnterpriseConfig" into rvc-qpr-dev am: 66909a0d am: 0569a540 -s ours

am skip reason: Change-Id I874b2f99fef693b34bad4b075eed595a0d89f392 with SHA-1 13121743 is in history

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

Change-Id: Ie9002fdfebfce32026076383f4eb57b625331af6