Merge "Merge "CTS: Use activity context when obtaining resource dimension info." into oreo-cts-dev am: f94bda9aef" into oc-dev am: 68bf649e4f
am: 4618e8cd9f

Change-Id: I36757b3753c678552212be36e64fa2bda43d8ba4