Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am: cbc75fa643  -s ours am: 7f71a70fd9  -s ours am: 81257a1750
am: d2cc39174c  -s ours

Change-Id: Ieaa4b57afcb731226fec7625ff7cb4016d54f53d
tree: 8cfc613c321e721ec7968b0dec2b9eaece5921ed
  1. tests/