Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE am: 57df090195  -s ours am: 0b083d58be  -s ours
am: 4ed8458384

Change-Id: I4246c353f509604b934b8d130486e26369ec2bf4