tree f5fecbcf252645ff4493ada86aa283cd9137b721
parent a96493b7a580b9716cc327273239326e96b584cb
parent e063867f7b652d61d1064a2a4975d7513d93a30e
author Treehugger Robot <treehugger-gerrit@google.com> 1618909591 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618909591 +0000

Merge "Update TEST_MAPPING imports for connectivity" am: e063867f7b

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

Change-Id: I100470cc936fca8dba86a1ad083d4d67139b6aea