tree 0926aa186e99ad00cbd0d79d6af94741184f3fd4
parent 4f3ee4c39f02654e91e325e291fc52fe63f969a7
parent 644166e04f440a49a3464d158dc2a126152eb0e5
author Treehugger Robot <treehugger-gerrit@google.com> 1603165645 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603165645 +0000

[automerger skipped] Merge changes Ifb1e44bd,Ic2632a12 into pie-cts-dev am: 23a906dbce am: 72eb05e7d3 -s ours am: 2b76b20996 -s ours am: 644166e04f -s ours

am skip reason: Change-Id Ifb1e44bdb2201859532e9b6cd340ff9209046d04 with SHA-1 720f458bac is in history

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

Change-Id: I02997dbf8e71a5339a2259badf16537ed563ed4c