Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: 4c0e93f15b am: 7e7aa6e163

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

Change-Id: Ifcae8b0e5ef093563e27948db6e6308a9be084a1