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 am: c1cff1a5 -s ours Change-Id: I681fd8394539f208a17abc7f5575f11b415dffee