Merge "Update CustomInputType AIDL documentation"