Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am: c8ef107a -s ours am: 0d4b5539 -s ours am: ec450e18 -s ours Change-Id: I2a9488519b38611ed0f03265ee018ca43d8a358b