Merge "resolve merge conflicts of b6347c9d48 to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp

This commit is contained in:
Jonathan Miranda authored and Android (Google) Code Review committed 2021-07-22 19:51:09 +00:00
commit 72784deb3f

Diff Content Not Available