[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