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