Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev