Merge "Update GSI keys for dynamic system image"
am: 8e5bd5a247

Change-Id: Id3fd51dcba04dc75779cc383b8ce56657b13e0e4