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

Change-Id: Ieaa54811613264b57bf6d6b5c3e4df7a796e1a3d
tree: 0af39c5596926f585d2183f4914ad832ef0fdaa6
  1. tests/