tree 691a0ba20eea142b4cc31996462a95c56b58830e
parent 4464a8554cabd6512e9bf84256225a1dcc49733b
parent b90a406ee3e66591e55a94916e32c6b79d582279
author Victor Chang <vichang@google.com> 1565290913 -0700
committer android-build-merger <android-build-merger@google.com> 1565290913 -0700

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

Change-Id: Ifbdc49ecd23236f54aadb80701e48c13536166b9