tree 1841ec62ec64c6b974b67fc8908066a082cc0fcc
parent eb0dc8f77566a27ca1ba290078d9d39be1b04188
parent a31a7b1bf4e2f16dde8819895c324284a84a14f6
author Lorenzo Colitti <lorenzo@google.com> 1616345462 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616345462 +0000

Merge changes from topic "backport-connectivityresources" am: a31a7b1bf4

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

Change-Id: Id6e8f89870b70332212e9052168e6f7c2faa3ee3