Merge "Move TaskSnapshot into android.window package"