Merge "AIDL: Fix test after aosp/2704653" into main