Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE

Change-Id: I126b325ab5686ab9a99735d47cad2a20e53022ca