Merge "DO NOT MERGE: CTS: Launch TestActivity on the Assistant Display" into oreo-cts-dev
am: aa7325a6ee  -s ours

Change-Id: I8520a206f50d16300ba15ebdc8280d53833de3ac