tree faaf4047680b4d5e45f73ff8bbe25fa617fe6073
parent 59fd1a96f7f91eb6c389b27a865e5e55f7a35058
parent 694b667138085cc07e8c6cc50167e34788a0ba90
author Schneider Victor-tulias <victortulias@google.com> 1622159549 -0700
committer Schneider Victor-tulias <victortulias@google.com> 1622160211 +0000

resolve merge conflicts of 694b667138085cc07e8c6cc50167e34788a0ba90 to sc-dev-plus-aosp

Test: manual
Bug: none

Change-Id: I2264c2dd3e0152186b7b14f76fa52126cbefe984