Merge "Mock DisplayMetrics in NotificationManagerTest" am: b1263d0363

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

Change-Id: I24c16d69009edbf448e05b526b1a6d39068b8fb9