tree 3716ca65dd59f16d6ca9d0058b61ce1d6abfe390
parent 75174ce1f4631454584fc163855c6de4dee21a4c
parent 486980a69d5d28ecb723512d6ceda70e8e256246
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1637446060 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1637446060 +0000

Snap for 7934630 from 486980a69d5d28ecb723512d6ceda70e8e256246 to sc-v2-release

Change-Id: Ibe02d7bd8ed176f00627478b293d0ccdc3bbd159