Merge "Added AIDL interface version check for backward compatibility" into main