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

Change-Id: I7d53e1ec57eb6a5a2399c82d21d90ea21b5d60c1