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

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

Change-Id: I6d500791586c98e68ef1e87dd1215570774e8164