Merge "DO NOT MERGE: Fix NPE in ActivityManagerDisplayTests" into oreo-cts-dev
am: 56f6f002ab  -s ours

Change-Id: Id05b64e69cb4de3fcd11a8ad965b1cc6d5476322