Merge "Fix the lint checking of CROSS_PROFILE_APPS_SERVICE"