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 am: 4b21c590

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

Change-Id: Id5d68193e5ec022e1f98fa6b79914730ed5fabad