Merge "Renaming AidlStatusUtil.h to AidlUtil.h" into main