[automerger skipped] Migrate framework-connectivity internal resources am:...

[automerger skipped] Migrate framework-connectivity internal resources am: 4f808486 am: 2c1e6d83 am: 842b3e6a -s ours am: 0a9f6225 -s ours

am skip reason: skip tag Change-Id I77a3efca2cd644f9828db1ed5d3cae8070fb8363 with SHA-1 dd5f6037 is already in history

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

Change-Id: I115738ba762455f937d6d151a558394a0965a61d