tree 9d0962be0393f60c890bf4e5cec1725db270db42
parent 0bb0a93e794a20541678072fabeb39f916d26c3f
parent 62834ba82864c7dfeb59d835b9b0391b852b9b4a
author Bill Yi <byi@google.com> 1600498857 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600498857 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 27c07910ff am: 3877bc308d -s ours am: 62834ba828 -s ours

am skip reason: Change-Id I583836eeeaf604391ed9b1196d4b41e872dc635d with SHA-1 efc4c754ae is in history

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

Change-Id: I98ff9d0bf9ae70d18e63885c68b613ff84c38f6a