Migrate framework-connectivity internal resources am: 8e12782094 am: 1f00de9e81

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

Change-Id: If36c3148d1a8c487ca3f25fa65e9b593f4e4d19d