Merge "expose getAidForApptype to system API"