Merge "Only move aosp_tv_arm64 to non-AB" into main