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

Change-Id: Iad9eb6d5da9767b3c0ae8a09d72eada09f6345db