Merge "Phase out Legacy GSI" am: 5561cc8c1d am: 8340cd335a am: 0b316b32a3

Original change: https://android-review.googlesource.com/c/platform/development/+/1485836

Change-Id: Ibef504b4965fccca8796e1cb7f5ce8749c444a95