Merge "CTS: Use the activity context to determine the correct display density" into oreo-cts-dev
am: 89fe1ada74

Change-Id: I1c14e98103f926da14d7ece1cea921351bd0ebed