tree 8933daf732cfc5dcc52195ef4be09b303bd2f6de
parent 764e1d48bafc5bc0971e8bf1118c28e285be5af3
parent 815fb834e5b1fce48f92542dcf812549c85e403b
author Yabin Cui <yabinc@google.com> 1628272563 +0000
committer Yabin Cui <yabinc@google.com> 1628272566 +0000

resolve merge conflicts of 815fb834e5b1fce48f92542dcf812549c85e403b to sc-v2-dev-plus-aosp

Change-Id: I7475d6a219ec1613543003712ca4d87567fc2ed5