Fix sc-dev-plus-aosp builds

Ignore-AOSP-First: Fix merge conflict
Bug: 208964910
Change-Id: I7924d7b19ec30e42fd1d17ec913c4a75d51ea6bc
(cherry picked from commit 823f787a31bf7826add4104c31c76e39981a0369)
Merged-In:I7924d7b19ec30e42fd1d17ec913c4a75d51ea6bc
1 file changed