[automerger skipped] Merge "Support removing AVB public keys" into rvc-dev am: 503e4884 -s ours
am skip reason: Change-Id I1af95adbbec655f40121f3392965dd1950aca4e5 with SHA-1 2fe786a5 is in history
Change-Id: I1e597c02e84d669bef3d30cef829afd2c7eeebff