tree fac7d14fa71d4d82be16e2ed528d940f1b5e51dd
parent e7e67f26cc3d2c411c181a72c23bf8886b5f5abe
parent af76459cc48590968328c934c550b01222e37c06
author Schneider Victor-tulias <victortulias@google.com> 1622159453 -0700
committer Schneider Victor-tulias <victortulias@google.com> 1622160202 +0000

resolve merge conflicts of af76459cc48590968328c934c550b01222e37c06 to sc-v2-dev-plus-aosp

Test: manual
Bug: none

Change-Id: I2dd82b1601bacab36cc589523780ca1166270223