tree 1dbbbc4f0d5086491213403438f077af85a0e522
parent ed513e7f73b052d542827d151ce2bc1e8760c7f9
parent c7dfe6783c98ec2cceb045d833df79b206190f9b
author Victor Chang <vichang@google.com> 1565291558 -0700
committer android-build-merger <android-build-merger@google.com> 1565291558 -0700

Merge changes from topic "reiwa_o_cts" into oreo-cts-dev am: b90a406ee3
am: c7dfe6783c

Change-Id: I261565ec04344a2ea05afa497b1f65f5223760bd