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

Change-Id: I5a20ec8986f2bfc810cec42ca7b33310aba337a4