Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD
am: 1eca62a8ce

Change-Id: I6d6dda22837a2c4f92e94e9bbee4af0d2fb08c39