Merge "Make function names consistent in AidlConversionUtils" into sc-dev