Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD
am: 062009ffd9

Change-Id: Iad49e8a9518b7350d42333d06f6e908a58d01c44