tree 21eacf23f8a485127e3912d970afb91e7980e483
parent 5b6eeab55763b65137b1b9f74cc6396fc2bf4748
parent 79f077a0eaf884164b865c670ea8a10b16b86b67
author Treehugger Robot <treehugger-gerrit@google.com> 1627968539 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1627968539 +0000

[automerger skipped] Merge "Mock DisplayMetrics in NotificationManagerTest" am: b1263d0363 am: 79f077a0ea -s ours

am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784388

Change-Id: I1f3c23e73147785f4d18b6f9b0b9f29c568c59c2