Merge "Remove android.hardware.automotive@libc++fs." into main