[automerger skipped] Merge changes from topic "backport-connectivityresources" am: 744e27a3 am: b8acfc23 am: cec8be5b -s ours am: fe7b3926 -s ours am: c56364fe -s ours

am skip reason: Merged-In Ic0d24d36af0b87153d527083f8964ddc6cd78482 with SHA-1 a405de07 is already in history

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

Change-Id: Id85a8adcd07a66a5f234a31f90f2ea3d20bb798d