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