tree 9d0962be0393f60c890bf4e5cec1725db270db42
parent f0a82c3288115fa3a37c07cda97710660d98efc0
parent 27c07910ff2140d7cb0e1fe0a7bfbd3bafbc35da
author Bill Yi <byi@google.com> 1600492954 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600492954 +0000

Merge mainline-release 6664920 to master - DO NOT MERGE am: 27c07910ff

Original change: https://android-review.googlesource.com/c/platform/cts/+/1430784

Change-Id: I7181cb5229bcf2f835159a3695e651261a11e81c