Merge "b/16154604 removing the settings link from the trust agent menu."