[automerger skipped] Merge "Revert "Fix testDataMigrationUtils fail on R device"" into stage-aosp-master am: c6fc9233fc -s ours
am skip reason: Merged-In Ib331656a7fe16d4f2aa62c1925f37296785042a3 with SHA-1 3b598cb092 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/19395385
Change-Id: I41060e820223d3630336b3e7389017fbb585e99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: