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

Change-Id: Ia54c7755ab4881d4986e2e72889ccc4a9af89010