Merge "Check the AIDL version instead of SDK level" into udc-mainline-prod