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

Change-Id: Ib04ab6d30f4a371d2d73cc7ed39d34775912829e