Merge "Phase out Legacy GSI" am: 5561cc8c1d

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

Change-Id: I21f671cd707061daa3460e21be1841f368fb95ac