Merge "add more comments for API getAidForAppType" am: 818a6e70e2
am: acb365f14b

Change-Id: I1d4b661c65a652800d5d4e3bf1cc813825b8089c