Merge "Remove unneeded notify AIDL API"