Merge "Remove unused rootdir/avb/*-gsi.avbpubkey modules" am: 1eeee3db am:...

Merge "Remove unused rootdir/avb/*-gsi.avbpubkey modules" am: 1eeee3db am: 5099a916 am: bc906626

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1938283

Change-Id: I6718b849e63227e2781df23bf82f8ed343219632