Merge "expose getAidForApptype to system API" am: 7cdc0f00eb am: 5d3b3d8ac8
am: dd5a4d9917

Change-Id: Icd0064f57f8138cc9c5a15099f8fdc5f1b4b5b25