Merge "Introduce a new IOriginTransitions.aidl interface for handling origin return transitions." into main