Merge "Merge "Fix signing on some GSI targets" into rvc-dev am: 3eeca14b am:...
Merge "Merge "Fix signing on some GSI targets" into rvc-dev am: 3eeca14b am: a93d0d48" into rvc-d1-dev-plus-aosp am: f073a230
Change-Id: I03b677b9ea588bb9119d059fa708f3c1f7e504b1